From 8ade92495da0392c8d63e38403bf34ca27d91085 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 8 May 2006 16:21:02 +0000 Subject: [PATCH] Fix tooltips. 2006-05-08 Matthias Clasen * gtk/gtkuimanager.c (update_node): Fix tooltips. --- ChangeLog | 2 ++ ChangeLog.pre-2-10 | 2 ++ gtk/gtkuimanager.c | 13 +++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a887edfc29..c4680a469f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-05-08 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Fix tooltips. + * configure.in: Require Pango 1.13.0 * gtk/gtknotebook.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a887edfc29..c4680a469f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2006-05-08 Matthias Clasen + * gtk/gtkuimanager.c (update_node): Fix tooltips. + * configure.in: Require Pango 1.13.0 * gtk/gtknotebook.c: diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index bc96c8e05e..68e2f3359b 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -2467,11 +2467,16 @@ update_node (GtkUIManager *self, gtk_action_connect_proxy (action, info->proxy); } - /* FIXME: we must trigger the notify::tooltip handler, since - * tooltips on toolitems can't be set before the toolitem - * is added to the toolbar. + /* FIXME: we must re-set the tooltip, since tooltips on toolitems can't be + * set before the toolitem is added to the toolbar. */ - g_object_notify (G_OBJECT (action), "tooltip"); + { + gchar *tooltip; + + g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL); + g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL); + g_free (tooltip); + } g_signal_connect (info->proxy, "notify::visible", G_CALLBACK (update_smart_separators), NULL); -- 2.30.2